xend: Remove tab indents
authorKeir Fraser <keir.fraser@citrix.com>
Mon, 23 Nov 2009 06:52:35 +0000 (06:52 +0000)
committerKeir Fraser <keir.fraser@citrix.com>
Mon, 23 Nov 2009 06:52:35 +0000 (06:52 +0000)
Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>
tools/python/xen/xend/XendDomainInfo.py
tools/python/xen/xend/XendNode.py
tools/python/xen/xend/XendXSPolicyAdmin.py

index f6becb6bcceb9f0cb08fae5967fea2fa900c09fd..4d7ec2cd40afb0d76f6047f2302165c75f388d7c 100644 (file)
@@ -2653,50 +2653,50 @@ class XendDomainInfo:
 
     def _freeDMAmemory(self, node):
 
-       # If we are PV and have PCI devices the guest will
-       # turn on a SWIOTLB. The SWIOTLB _MUST_ be located in the DMA32
-       # zone (under 4GB). To do so, we need to balloon down Dom0 to where
-       # there is enough (64MB) memory under the 4GB mark. This balloon-ing
-       # might take more memory out than just 64MB thought :-(
-       if not self.info.is_pv_and_has_pci():
-               return
-
-       retries = 2000
-       ask_for_mem = 0;
-       need_mem = 0
-       try:            
-           while (retries > 0):
-               physinfo = xc.physinfo()
-               free_mem = physinfo['free_memory']
-               nr_nodes = physinfo['nr_nodes']
-               node_to_dma32_mem = physinfo['node_to_dma32_mem']
-               if (node > nr_nodes):
-                    return;
-               # Extra 2MB above 64GB seems to do the trick.
-               need_mem = 64 * 1024 + 2048 - node_to_dma32_mem[node]
-               # our starting point. We ask just for the difference to
-               # be have an extra 64MB under 4GB.
-               ask_for_mem = max(need_mem, ask_for_mem);
-               if (need_mem > 0):
-                    log.debug('_freeDMAmemory (%d) Need %dKiB DMA memory. '
-                              'Asking for %dKiB', retries, need_mem,
-                              ask_for_mem)
-
-                    balloon.free(ask_for_mem, self)
-                    ask_for_mem = ask_for_mem + 2048;
-               else:
-                    # OK. We got enough DMA memory.
-                    break
-               retries  = retries - 1
-       except:
-           # This is best-try after all.
-           need_mem = max(1, need_mem);
-           pass
-
-       if (need_mem > 0):
-           log.warn('We tried our best to balloon down DMA memory to '
-                    'accomodate your PV guest. We need %dKiB extra memory.',
-                    need_mem)
+        # If we are PV and have PCI devices the guest will
+        # turn on a SWIOTLB. The SWIOTLB _MUST_ be located in the DMA32
+        # zone (under 4GB). To do so, we need to balloon down Dom0 to where
+        # there is enough (64MB) memory under the 4GB mark. This balloon-ing
+        # might take more memory out than just 64MB thought :-(
+        if not self.info.is_pv_and_has_pci():
+            return
+
+        retries = 2000
+        ask_for_mem = 0
+        need_mem = 0
+        try:
+            while (retries > 0):
+                physinfo = xc.physinfo()
+                free_mem = physinfo['free_memory']
+                nr_nodes = physinfo['nr_nodes']
+                node_to_dma32_mem = physinfo['node_to_dma32_mem']
+                if (node > nr_nodes):
+                    return
+                # Extra 2MB above 64GB seems to do the trick.
+                need_mem = 64 * 1024 + 2048 - node_to_dma32_mem[node]
+                # our starting point. We ask just for the difference to
+                # be have an extra 64MB under 4GB.
+                ask_for_mem = max(need_mem, ask_for_mem);
+                if (need_mem > 0):
+                    log.debug('_freeDMAmemory (%d) Need %dKiB DMA memory. '
+                              'Asking for %dKiB', retries, need_mem,
+                              ask_for_mem)
+
+                    balloon.free(ask_for_mem, self)
+                    ask_for_mem = ask_for_mem + 2048
+                else:
+                    # OK. We got enough DMA memory.
+                    break
+                retries = retries - 1
+        except:
+            # This is best-try after all.
+            need_mem = max(1, need_mem)
+            pass
+
+        if (need_mem > 0):
+            log.warn('We tried our best to balloon down DMA memory to '
+                     'accomodate your PV guest. We need %dKiB extra memory.',
+                     need_mem)
 
     def _setSchedParams(self):
         if XendNode.instance().xenschedinfo() == 'credit':
index bb1dad4eabbbc33d324a89b594826f64cbaa9a0a..4ee63f6d46cac92d87be316b2964937cf46aae19 100644 (file)
@@ -896,10 +896,10 @@ class XendNode:
         info['total_memory'] = info['total_memory'] / 1024
         info['free_memory']  = info['free_memory'] / 1024
         info['node_to_cpu']  = self.format_node_to_cpu(info)
-        info['node_to_memory'] = self.format_node_to_memory(info,
-                                       'node_to_memory')
-        info['node_to_dma32_mem'] = self.format_node_to_memory(info,
-                                       'node_to_dma32_mem')
+        info['node_to_memory'] = \
+            self.format_node_to_memory(info, 'node_to_memory')
+        info['node_to_dma32_mem'] = \
+            self.format_node_to_memory(info, 'node_to_dma32_mem')
 
         ITEM_ORDER = ['nr_cpus',
                       'nr_nodes',
index 61420e30b67a3bbb2f7e70f5cea6d145d3cb3063..8df8d0d72857e67ec5bc72f43f5cdd388c378483 100644 (file)
@@ -79,7 +79,7 @@ class XSPolicyAdmin:
         rc = 0
         if security.on() == xsconstants.XS_POLICY_ACM:
             rc |= xsconstants.XS_POLICY_ACM
-       else:
+        else:
             rc |= xsconstants.XS_POLICY_FLASK
         return rc